Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 22:09:25 +0000 (14:09 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 22:09:25 +0000 (14:09 -0800)
commit4b5730ed01195e9af2228c5222f67c1a4d2cdfdd
treef3fb9671aaa7340e4791e99d33c53d45e583017d
parent9dd44e9174748faf99bb3e6b02a43f4a57490f12
parent413fd8a200004fd685ecaac1b1d3b2d2a3846194
Merge from mainline.